Docs(merge_strategies): Clarfiy rebase and ff merge similarity#11373
Merged
lecoursen merged 6 commits intogithub:mainfrom Nov 4, 2021
Merged
Docs(merge_strategies): Clarfiy rebase and ff merge similarity#11373lecoursen merged 6 commits intogithub:mainfrom
lecoursen merged 6 commits intogithub:mainfrom
Conversation
|
Thanks for opening this pull request! A GitHub docs team member should be by to give feedback soon. In the meantime, please check out the contributing guidelines. |
Contributor
|
@devtayls |
lecoursen
approved these changes
Nov 4, 2021
Member
|
The link check errors are unrelated to this PR. |
Contributor
|
Thanks very much for contributing! Your pull request has been merged 🎉 You should see your changes appear on the site in approximately 24 hours. If you're looking for your next contribution, check out our help wanted issues ⚡ |
1 task
2 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why:
Closes 1387
What's being changed:
Content Changes
to:
This is because as @bk2204, @spikyjt explained in the issue, rebasing looks like
ff-merge, but in actuality is a destructive method which changes the project history.Refactor
Move paragraph on enabling Rebase and Merge behind paragraph explaining how rebasing works on Github. This flows better as: 'What is rebase and merge?' -> 'How do I enable Rebase and Merge?' Than the previous version which was: 'What is rebase and merge?' -> 'How do I enable Rebase and Merge' -> 'How github rebase differs from git rebase'
Check off the following:
Writer impact (This section is for GitHub staff members only):